reworked folder structure, permissions etc.