refactor project structure. v2.5.4