Add new files to start refactor