1.5.2 update and a little bit of reorganization