Move some lib stuff back into main file- no need for all that separation
minor commandline change