Re-Organized Configuration and added Permissions.