Reorganized project structure, implemented properties