Re-arranged folder hierarchy.

Code is unchanged.