restructure files apart from data