seperated files into folders and added Makefile