Refactored classes to make them more readable.
ignored classpath, project and .settings file
from local