Restructured

- everything working so far
- effects still a mess