Reorganized a few things
test