Move everything to new Makefile structure!