Organization in modules

Up to 2.0.1 version.