Moved initial classes over to proper assembly. Will split later