Refactoring new project Parky