Fixed makefile, restructured directories