Did some clean up and added cross-OS directory

Change-Id: Ib67281cd5adc6054b58f6bc02713ed9cebad85a6