Moved bunch of stuff into module files