Restructured Project and added url safety
Restructured Project and added url safety