Completed refactoring of layout into smaller labs/modules/solutions