package structure now more functional orientated instead technical