Refactor to common folder structure