Moved files to more sensable locations.