rearrange file layout, add fake tests