Fix inital file structure