Moved some files around, streamlined application