Reorganize styles files to be consistent with the rest of the app