Doing project refactoring. Trying not to break git