Re-structuring jmetal package