Improved the main for all files to not create objects unnecessarily
CLI parser completed