Moved to a better package-style structure, and created a make file for the project