Makefile changes. Src files reorg