Database restructuring & file cleanup