Reorganization to import the project easily on eclipse