Move some stuff around for Eclipse