Simple modules refactory
Removed redundant imports
Refactory: continue...