Add more code to java classes and moved .sql to setup folder