Various fixes, rearranged file locations