Changed folder structurs