fixed some weird package structure problems