Renamed needed folders and files

Signed-off-by: George Araujo <ext-george.araujo@microsoft.com>