refactor folder structure and cleanup