refactor

changed structure