Updated to cope with the move of src to ./src/