Moving files into versioned folder /1/

I'm also going to start working directly on the master for the time
being.