Hooked the two scenes together

What the hell am I doing?
Moved some common/* files into directories