Fixed directory structure, removed sps directory
Merge branch 'master' of https://github.com/seedghs/winter2014