File restructuring

For faster uploads to the server.