Added classpath and project and changed minimal other things