Added Logic for pretty URLS
Cleaned up namming conventions and structure