Simplifying module structure to allow shorter require statements