Directory structure refactoring

Directory structure refactoring