Start using the new file structure