Move code back to main director.
Fix paths.