Reorganized directories

Reorganized directories for requirements