Removed commented out main. Removed unnecessary comments.
Moved libraries to lib