Clean inner dependency hierarchy
Merge branch 'develop' of https://github.com/taskurotta/taskurotta into develop