Project Cleanup

Cleaned up code
Fixed eclipse project and classpath settings.