Removed default package and reorganized package structure.