Changed project structure - reorganized all the packages