Re-organising repo for easier install