Put logic in seperate folder