Reorganizing, removed broken tab feature, modularizing.