Used more consistent module names
More consistent directory structure
Improved search and error results