Moved all data declarations to applicable module.