trimmed down beans, moved mvc stuff to new package