adjust folder/package structure