Fix merge error
Fix merge error

Part of moving code around and adding a new module to avoid circular dependencies for annotations displaying file tables

ENCODE-DCC/snovault,T2DREAM/t2dream-portal,ENCODE-DCC/snovault,ENCODE-DCC/encoded,ENCODE-DCC/snovault,ENCODE-DCC/encoded,ENCODE-DCC/encoded,ENCODE-DCC/snovault,T2DREAM/t2dream-portal,ENCODE-DCC/encoded,ENCODE-DCC/snovault,T2DREAM/t2dream-portal,T2DREAM/t2dream-portal