codestyle
extract dimensions
rename package