Begin restructuring the code mess (breaks build)