WBL: Rearrange to be accessible in eclipse workspace