Complete overhaul of file structure