reorganization, renaming, cleanup

gave up on Fritzing