Refactor folder structure for easy packing