restructure file hierarchy

fixing