Merge pull request #39 from bazelbuild/directory_refactor

directory refactor and class and source allignment with -2.params fil…