General Cleanup
> Switching to a better branch organisation.