Moved space classes into new app module structure