Revert "Delete the old movies folder and rename movies2 to movies [aa39136]"

Looking back this work isn't anywhere near ready for inclusion. I never finished
implementing several of the features.

This reverts commit ec9b70f6e5d7c75562fa25d51a3a296fe53eb7b1.
Revert "Merge pull request #44 from fyfe/big-cleanup"

This wasn't ready to be merged.

This reverts commit aa39136bab0d01fc3f782d975ff3a440a3b14737, reversing
changes made to a79ce4268e4767811537e9ac0e2aed5069a9421a.