removed where clause and added language pragma
added structs module