updated packages, project structure