Introduced new files for incoming refactor of application