Change file structure, add files for future modularization