Added new scene module
Major cleanup, removed features for move to scene

The removed features will be re-added in the scene module