cleanup packages
cleanup
wrong import
token initialisation, TODO rename view package