Update file structure and naming, start to split out files for modularity