reoorganizing project structure fix #27