Moving of script files, slightly more structure