Fixed Naming Convention and Improved Readabillity

Not quite finished yet. I think three of four files still need to be
improved. Code looks uch cleaner and easier to read. Also made much
better comments.