re-arrange file structure