Refactored module organization a little bit more. It turns out bb74202
was wrong