Changed structure back to original project