Renamed without underscore
Added directory for improved approach
Moved directory constants here