Revert 1092b63..85ea997

This rolls back to commit 1092b63aaa5595a5e57ba455c027e2ca507970b7.
Updated with proposed new layout