- Remove stupid finals
- Move internal stuff to the internal package
- remove old imports