Restructured for working in Eclipse