Refactor folder structure, eliminating file repetition