Fixed package names and strucutre