Radically refactored project setup and container classes