update comments, file structure