Updated structure
Added permissions