New project structure and merged part 1 and 2