Clean up

* Rearrange source
* Remove todos
* Move media