Changed file names
Added javadoc-comments, reformatted code and removed traces of error calculation. Error calculation will be outsourced to a separate branch