refactoring : make structure simple
Merge branch 'master' of https://github.com/psjava/psjava.git