Moved logic and helpers to own modules
Moved more stuff around