sorted project structure and controller/container classes