Sorting classes into directories
various other updates