Restructuring fields and internals / CLI and Django update