Format
Format
Rearrange files
Add test target
More tests
Test