Changed folder naming and deleted Not For Implementation folder