Change directory architecture to use 2 separated projects.