Redesigned directory structure for correct namespaced autoload