Fixed issue with classes not being created in the correct packages.