Moved some files around, added vi-mode just cause