Rearranged files to avoid usage of symbolic links