refactored startup and reorganized project