moved some files into directories, edits to makefile