Feature/feature 2.0

finish feature 2.0      
refactor project structure