Reorganize mounting system

Change-Id: I068759065e8f6a3c17312f9278b3a06e833da684