moved some files, and quick check-up

...