Renamed src to lib
Parser abstraction
Improved duplication count