Rearranged sourcefiles locations