refactor
rearranged condition folder structure