Fixed package names and project structure