Simplifying module system to single functions, breaking some things up.