Moved non-Dagger modules to ui folder