Web version + moved the java files