file structure restructure