Removed 'smart' solver in favor of faster brute force method. Reorganized file a bit.