Simplified hierarchy, removed unnecessary files, and fixed toplevel file issues