Adjusted folder structure to ensure AMD loader work properly