Directory cleanup and access control layer first steps.