1. Added submodules
2. Modified setup.rb