Removed folder structure, updated to include latest extension attributes.