Fixed server crashes & rearranged some folders