Organized structure
Merge branch 'master' of https://github.com/yanpeiliu/SleepScale

Conflicts:
	src/src.sln