Finished recreating CH4/5 tables; reorganized files