Cleaned some files and added apache.commons as a dependency in output