changed file and class names to singular case, also added getters and setters in the entity classes