moved files around. cleaning syntax.