add package structure to all usecases