[--bugid=54831--] Re-architecture to accomodate unittests in AmazonTools
[--bugid=54831--] Add unit tests for VPC