Refactored structure, removed git push on install