Refactor project structure

Refactor project structure part 1