Fixed folder issue in packages
Reorganised package structure