Changed names

- Changed names of classes and dirs