Refactor folder structure, start routing