Refactored classes to no longer be under Form namespace since API has been separated into another project.