Moving files into one folder and fixing python install.