moved layout-related classes into their own namespace
shortcut test greatly improves performance