Added Civilian.java to replace NCP.java