Refactored namespaces to remove plurals. Example: Forms -> Form