some refactor of folder structure.