Move some files and organize.