Refactoring and project planning dev