Cleaned up code
Reorganized classes and namespaces
Reorganized classes and namespaces
Added tests for ACLMetadataLoader
Fixed and improved tests