minor fixes regarding file hierarchy