Rearranged some files and updated list helpers