Moving to lib folder and changing how arguments are parsed