fixed redundant file structure