Re add cleaned up modules