Added new class to handle paths
Source updated
Removed unused variables and exceptions