Refactoring + separation of logically completed pieces of code within different files