Moved things around
YUIDoc + minor refactoring