Export directory modules by default
Use a better scheme for wrapping things in modules