Moved source files into src directory. Updated make