Reshuffled files; made the less nested; separeted container views into individual files (and their tests too)