Moving some files from the Top level dir to more appropriate places