Removed an unnecesary file
Fixed several namings to be more consistent
Adding documentations