Moved conditionals into folder