Cleaner Module organization