Changed folder naming conventions