reorganized project directory structure