Updated JavaDoc and src rename