Implemented the new package structure