refactored application paths