Fixed some incorrect paths, duplicate package declarations