file structure re-organization