Renamed child modules for easier viewing and updated API to 2.0-beta1