Refactored module names
Adjusted notes to be visible