set up files as per video
complete refactoring