Changes September

All changes requested Aug 27 and 30th. Only missing package reorganization.