Classpath and project changes
Some changes.... not sure what though