Some directory changes, going to start using eclipse instead.