Renamed the directories
Made class as final
Renamed the directory