consolidate files

Signed-off-by: Brian Dong <dong.brian@gatech.edu>