Changes to have the right package names & first successful build