Moved some files around and added a few comments