* Unify usage of top level folders short_name * Fix docs * Update schema * Fix tests * Fix tests * More fixes