reorganised code, to Java and CS folders