Finish prompt questions and fix package structure