Moved modules for good
Moved more things to modules