overhauling file structure (in progress)