Removed PREFIX_ALSP
Merge remote-tracking branch 'origin/elemental' into elemental
Renmaed folder name