Getting more organized with code

Content and Form are right now