Reorganize files. Add expecta and more tests