Moved to lib folder
Removed unnecessary code
Minor changes
Whitespace
Whitespace