Upgraded assembly version and finalized some reorganization.