changing file structure drastically