Move some files around
Work on factoring out code from sketch file