Changed handling of portrait. Changed composition of ConverterService.
UserService
Moved test files