Move around some files
Make code a little more confusing