Re-organizing and stuff

Just a few things.........