reorganizd file structure