Rearranged folders, fixed StackOverflow (oops)