Organization

Organized the code a little bit nicer.