ACLs, File Structure Re-Org, Helper Refactoring

So basically everything I did while on vacation. Includes a ton of refactoring.