Restructure + added some permissions endpoints