Changed folder structure, change request implemented