Moved EPF class to proper path