Preparation to move content one level up
Moved everything one level up