re-ordering the codebase in order to pull/push from the same branch