updated repo name and move stuff around in theme repo to solve Travis CI error