Rebase files for better building and linking. Includes now copy to bin dir.