Changed folder structure for package