refactored folder structure for packaging