Move to servlet package.
Begin refactoring to support resource dependencies.
Fix deprecation warning.
Do not add empty requires string.
Support resource dependencies.