Added __packageName__ variable to be used in path. Refactored code.