Changed location of main and improved Census.java