Package reorganization

Applied the package re-organization as decided at the f2f.

@capitancambio please review (I tested with a tweaked assembly and it seems to run OK)