Moved all the files around to have better compatability with standard IDE's