Refactor on folder structure and pkg