Make the directory structure less verbose
Make namespace less verbose, fix uints
Be more specific with aery32 includes