More Updates

Code has been updated and the structural quality of the code has been
improved (passed lint checks). I have also updated the naming of files.