Moved around some files and changed compiling instructions