Reorganize
Some initial tests