Reorganized to solve some issues with Eclispe.