Tidy

Tidy up to take out of Eclipse workspace