Renamed modules, rewrote Form

Removed files that are not AMD modules, Complete rewrite of form