Refactored
Refactored - Class Cohesion
Added rediret to index.html