Class names and directory tree updated