ported the project to eclipse and refined inicial architecture