Rearranged many files and classes