lots code cleanup. hey look, folder hierarchies