Move main class into lib directory
Remove currency format if non-standard dividers