Rearrange project dirs and add workspace file