Rearranged files to prepare for running on a server.