Created sun projects, refactored the whole project