Reorganise GIT repo
Consolidate code