Refactoring and project file updates