Moved layers and tweens into independent objects

Updated references to layers