code seperated into correct files, Makefile in use again