Moved some files around to make room for Auth code