Today modules, tomorrow, the world!

I think this is what you real programmers call code refactoring