Re-organize and start architecture of back end