Moved some files, fixed make dist