-major overhaul of code organization