Refactored library files and removed unused utility files.