Rearranged files and class stack