Restructure for eclipse