solution structure
cleanup package folder