added support for camel case and multiple packages