Updated/New Composer support for System_Folders

See diff for full changes