completely re-arranged workspace layout.

Adopted Pahimar's workspace arrangement. Moved everything around.