renaming folder names
Merge branch 'master' of https://github.com/withcenter/x
workig on simple update
bug fixing
bug fix