Moved some source files around