Moving files around for modularization