File structure tinkering complete