Small modifications to accomodate the new name to the api dir
minor modifications - removed unwanted code and comments