rearrange files, get it working at least a little