Changed project structure with new packages.