Merged content and game folders.  Synced up to version 1.0