Moved directory structure

Moved directory structure