Moved files into seperate folders, need to adjust Makefile