deleting way's stuff.
some refactoring
Merge branch 'sora' of https://github.com/ruinakata/sora into sora
refactored directives