Moved classes into namespaced domain folder