New version released with reorganization, and bugfixes