Moves field classes to their parent container tag

See ticket #8

This is only meant to be a pull for d9b4fa969ce451ce92cc28d5c873f0bcb1fe9919 

The other commits should be addressed in the earlier pull. I think the pull request should be automatically updated as to not include those if that other pull request were to be accepted.