Add Form support

Restruct file to match PSR