Reorganize folders and classes