restructured; fixes #1; now everything should blend together --> not completely separate