Shuttle Discovery moved to VAB ahead of May launch