Moved files around so it is easier for people to copy source files