Refactor code (move into parent folder)