Refactoring some files to base project