Major restructuring: Modularization (unfinished)