Reverted last commit, brought the file trees back for Eclipse compatability