Changes, reorganization, other things. Fixes #4