Created Makefile, changed directory structure