Yeah, if you could stop changing packages structure, that'd be great!