Refactor code into seperate files
Add one more file:wqa::