cleaning up manifest.json
rearranging directory structure
more cleanup