Rearrange files and cleanup for next release