Remove subdirectory
Add classes.