Milestone 2 & Further Reorganization