Merge pull request #2 from KiaFathi/kiaFeatures

awesome. now we have a new folder structure which is more maintainable !!!
Fix routing of states, serve correct HTML