Re-structure repo to suit server set-up