Polished .classpath again and resolved import conflicts

Signed-off-by: logineimer <logineimer@googlemail.com>