Changed folder structure, refactor.