Modularization done. Still bitching about cross domain though.