Restructuring project for eclipse