Added new modules. Full redesign