changed folder structure to match package definition