Updated BOM and cleansed up directories.