pushed more of the code down to app/, brought back the version file and deleted extraneous files from reorg