Add comment to singleton module
Removed old modules
Add dependency