Mount/pet fixes + initialize modular structure.