Updated organization of code.