reorganizing project directory structure
minor changes